Don't load .custom if -q was used.

diff --git a/lisp/custom.el b/lisp/custom.el
index 910ef02b1872a7e17c4bb9a69be3d0663ad1522a..e747264583c105aeb8cc165f381e230fc691e897 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -2463,8 +2463,9 @@ Face used for customization fields while they are being edited.")
                     (not (string-match "XEmacs" emacs-version)))
 (custom-category-put 'custom-hidden-properties intangible t)
 
-(if (file-readable-p custom-file)
-    (load-file custom-file))
+(and init-file-user  ; Don't load any init file if -q was used.
+     (file-readable-p custom-file)
+     (load-file custom-file))
 
 (provide 'custom)